tests: Better error message if target is not a symlink
authorColin Walters <walters@verbum.org>
Wed, 11 Apr 2018 17:31:18 +0000 (13:31 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Wed, 11 Apr 2018 19:11:07 +0000 (19:11 +0000)
I broke the code for this and ended up adding this to debug it.

Closes: #1535
Approved by: jlebon

tests/admin-test.sh

index b546e142d12b3cf7d27b888e7357516214d23dde..6e3fd782d43cb6a358fa897568293be6c198be8b 100644 (file)
@@ -147,8 +147,13 @@ ln -s /ENOENT sysroot/ostree/deploy/testos/deploy/${rev}.3/etc/a-new-broken-syml
 ${CMD_PREFIX} ostree admin deploy --retain --os=testos testos:testos/buildmaster/x86_64-runtime
 assert_not_has_dir sysroot/boot/loader.0
 assert_has_dir sysroot/boot/loader.1
-linktarget=$(readlink sysroot/ostree/deploy/testos/deploy/${rev}.4/etc/a-new-broken-symlink)
-test "${linktarget}" = /ENOENT
+link=sysroot/ostree/deploy/testos/deploy/${rev}.4/etc/a-new-broken-symlink
+if ! test -L ${link}; then
+    ls -al ${link}
+    fatal "Not a symlink: ${link}"
+fi
+linktarget=$(readlink ${link})
+assert_streq "${linktarget}" /ENOENT
 assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.3/etc/os-release 'NAME=TestOS'
 assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.4/etc/os-release 'NAME=TestOS'
 assert_file_has_content sysroot/ostree/deploy/testos/deploy/${rev}.4/etc/a-new-config-file 'a new local config file'